bitkeeper revision 1.321 (3f0c3721EPUc_lgxSWz2JlomJJPMtg)

Move XenoLinux-specific stuff from hypervisor interface
include files to XenoLinux include file.

diff --git a/.rootkeys b/.rootkeys
index c3a8b7b20124c73515e4a89bf4b150c3a526702c..dca28d4ed433419c4e1608bb20ac7887ea249830 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -539,6 +539,7 @@
 3f05a939_I9vPADPgyVBwUDUxtoeOQ xenolinux-2.4.21-sparse/fs/partitions/xeno.h
 3e5a4e66wbeCpsJgVf_U8Jde-CNcsA xenolinux-2.4.21-sparse/include/asm-xeno/bugs.h
 3e5a4e66HdSkvIV6SJ1evG_xmTmXHA xenolinux-2.4.21-sparse/include/asm-xeno/desc.h
+3f0c3721E5WAnbeoPp7PE35J_Ndxaw xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h
 3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h
 3e5a4e67w_DWgjIJ17Tlossu1LGujQ xenolinux-2.4.21-sparse/include/asm-xeno/highmem.h
 3e5a4e67YtcyDLQsShhCfQwPSELfvA xenolinux-2.4.21-sparse/include/asm-xeno/hw_irq.h

diff --git a/tools/internal/Makefile b/tools/internal/Makefile
index 5f33fdf4cd61ffc54248e7667453a7832bcc9be0..c39dcf621b79a2d09a08471250d0c2cb54f2d401 100644 (file)
--- a/tools/internal/Makefile
+++ b/tools/internal/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -Wall -I../../xen/include
+CFLAGS = -Wall -I../../xen/include -I../../xenolinux-2.4.21-sparse/include
 XI_CREATE = xi_create
 XI_START = xi_start
 XI_STOP = xi_stop

diff --git a/tools/internal/xi_build.c b/tools/internal/xi_build.c
index c8dfc7878646724babb553fdcd64c2a346c49a88..59c4340db23abdbb649f892ffa1d27b35db22a17 100644 (file)
--- a/tools/internal/xi_build.c
+++ b/tools/internal/xi_build.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "asm-xeno/dom0.h"
 #include "hypervisor-ifs/hypervisor-if.h"
 #include "dom0_ops.h"
 #include "dom0_defs.h"

diff --git a/tools/internal/xi_create.c b/tools/internal/xi_create.c
index 7c3010aff246dcf9ed192c423a0d7259a8f3665d..ad893285e26f68084176b163e7c70f84583cff86 100644 (file)
--- a/tools/internal/xi_create.c
+++ b/tools/internal/xi_create.c
@@ -19,6 +19,7 @@
 #include "dom0_ops.h"
 #include "dom0_defs.h"
 #include "mem_defs.h"
+#include "asm-xeno/dom0.h"
 
 /***********************************************************************/
 

diff --git a/xen/include/hypervisor-ifs/dom0_ops.h b/xen/include/hypervisor-ifs/dom0_ops.h
index b6df8bee46aae32f65723cb53f75789005ccb642..b437acec26f54239a6f06c33ea1eb6df6793454d 100644 (file)
--- a/xen/include/hypervisor-ifs/dom0_ops.h
+++ b/xen/include/hypervisor-ifs/dom0_ops.h
@@ -112,38 +112,4 @@ typedef struct dom0_op_st
 } dom0_op_t;
 #endif
 
-/* These really belong in a Linux header file somewhere.
-   XXX.
-*/
-#define IOCTL_DOM0_CREATEDOMAIN _IOC(_IOC_READ, 'x', 0, sizeof(struct dom0_createdomain_args))
-#define IOCTL_DOM0_MAPDOMMEM _IOC(_IOC_READ, 'x', 1, sizeof(struct dom0_mapdommem_args))
-#define IOCTL_DOM0_UNMAPDOMMEM _IOC(_IOC_READ, 'x', 2, sizeof(struct dom0_unmapdommem_args))
-#define IOCTL_DOM0_DOPGUPDATES _IOC(_IOC_READ, 'x', 3, sizeof(struct dom0_dopgupdates_args))
-
-struct dom0_createdomain_args
-{
-    unsigned int kb_mem;
-    const char *name;
-};
-
-struct dom0_mapdommem_args
-{
-    unsigned int domain;
-    unsigned start_pfn;
-    unsigned tot_pages;  
-};
-
-struct dom0_unmapdommem_args
-{
-    unsigned long vaddr;
-    unsigned long start_pfn;
-    unsigned long tot_pages;
-};
-
-struct dom0_dopgupdates_args
-{
-    unsigned long pgt_update_arr;
-    unsigned long num_pgt_updates;
-};
-
 #endif

diff --git a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
index a792d9047c8e258b96824c7a93015ef42fbd093c..a6f03f7caab3cf2564f53526282eadde64f2acf8 100644 (file)
--- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
+++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
@@ -29,6 +29,7 @@
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
+#include <asm/dom0.h>
 
 #include "dom0_ops.h"
 

diff --git a/xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h b/xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h
new file mode 100644 (file)
index 0000000..16e5fb3
--- /dev/null
+++ b/xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h
@@ -0,0 +1,36 @@
+/* IOCTLs used when access /proc/xeno/dom0_cmd. */
+#ifndef __DOM0_H__
+#define __DOM0_H__
+
+#define IOCTL_DOM0_CREATEDOMAIN _IOC(_IOC_READ, 'x', 0, sizeof(struct dom0_createdomain_args))
+#define IOCTL_DOM0_MAPDOMMEM _IOC(_IOC_READ, 'x', 1, sizeof(struct dom0_mapdommem_args))
+#define IOCTL_DOM0_UNMAPDOMMEM _IOC(_IOC_READ, 'x', 2, sizeof(struct dom0_unmapdommem_args))
+#define IOCTL_DOM0_DOPGUPDATES _IOC(_IOC_READ, 'x', 3, sizeof(struct dom0_dopgupdates_args))
+
+struct dom0_createdomain_args
+{
+    unsigned int kb_mem;
+    const char *name;
+};
+
+struct dom0_mapdommem_args
+{
+    unsigned int domain;
+    unsigned start_pfn;
+    unsigned tot_pages;  
+};
+
+struct dom0_unmapdommem_args
+{
+    unsigned long vaddr;
+    unsigned long start_pfn;
+    unsigned long tot_pages;
+};
+
+struct dom0_dopgupdates_args
+{
+    unsigned long pgt_update_arr;
+    unsigned long num_pgt_updates;
+};
+
+#endif __DOM0_H__ /* __DOM0_H__ */